merge trunk
authorK. Handa <handa@gnu.org>
Fri, 26 Apr 2013 14:21:40 +0000 (23:21 +0900)
committerK. Handa <handa@gnu.org>
Fri, 26 Apr 2013 14:21:40 +0000 (23:21 +0900)

Trivial merge